Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

i3808 missing Fortran compiler config for macOS M1 runner #3811

Merged
merged 5 commits into from
Feb 8, 2024
Merged

i3808 missing Fortran compiler config for macOS M1 runner #3811

merged 5 commits into from
Feb 8, 2024

Conversation

agriyakhetarpal
Copy link
Member

Description

Closes #3808

Type of change

Please add a line in the relevant section of CHANGELOG.md to document the change (include PR #) - note reverse order of PR #s. If necessary, also add to the list of breaking changes.

  • Bug fix (non-breaking change which fixes an issue)

Key checklist:

  • No style issues: $ pre-commit run (or $ nox -s pre-commit) (see CONTRIBUTING.md for how to set this up to run automatically when committing locally, in just two lines of code)
  • All tests pass: $ python run-tests.py --all (or $ nox -s tests)
  • The documentation builds: $ python run-tests.py --doctest (or $ nox -s doctests)

@agriyakhetarpal agriyakhetarpal linked an issue Feb 7, 2024 that may be closed by this pull request
Fortran compiler (FC variable) missing in macOS M-series runners, breaks SUNDIALS compilation #3808
Closed
@agriyakhetarpal agriyakhetarpal marked this pull request as ready for review February 7, 2024 18:48
@codecov Codecov
Copy link

codecov bot commented Feb 7, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (84bfd61) 99.59% compared to head (c998dc4) 99.59%.

Additional details and impacted files 
@@           Coverage Diff            @@
##           develop    #3811   +/-   ##
========================================
  Coverage    99.59%   99.59%           
========================================
  Files          257      257           
  Lines        20806    20806           
========================================
  Hits         20722    20722           
  Misses          84       84

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

kratman
kratman reviewed Feb 8, 2024
View reviewed changes
Copy link
Contributor

@kratman kratman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any issues with this if everything is working. Have both updated workflows been tested on your fork already?

If so I will switch this to an approval

@agriyakhetarpal
Copy link
Member Author

I did not create this PR from a branch through my fork. The PR tests are working here since the erroneous cached wheel is removed prior during the nox session invocation. I have just triggered a workflow run from this branch here: https://github.com/pybamm-team/PyBaMM/actions/runs/7835711305

@agriyakhetarpal
Copy link
Member Author

From the workflow run, I forgot that pybamm_install_odes will fail on Python 3.12 on Linux and macOS. I will comment that out in the workflow file rather than removing entirely so that we can remember to bring it back someday.

@kratman
Copy link
Contributor

kratman commented Feb 8, 2024

I did not create this PR from a branch through my fork. The PR tests are working here since the erroneous cached wheel is removed prior during the nox session invocation. I have just triggered a workflow run from this branch here: https://github.com/pybamm-team/PyBaMM/actions/runs/7835711305

Ok if I forget to come back and check if it worked, just ping me

@agriyakhetarpal
Copy link
Member Author

Triggered another run for the scheduled tests here: https://github.com/pybamm-team/PyBaMM/actions/runs/7835843395

@kratman kratman merged commit 88ae929 into develop Feb 8, 2024
80 of 81 checks passed
@kratman kratman deleted the 3808-gfortran-macos-m1-runner branch February 8, 2024 23:59
js1tr3 pushed a commit to js1tr3/PyBaMM that referenced this pull request Aug 12, 2024
@agriyakhetarpal @pre-commit-ci @js1tr3
i3808 missing Fortran compiler config for macOS M1 runner (pybamm-tea…
6c0f98e 
…m#3811)

* pybamm-team#3808 install missing macOS deps for M1 runner

* pybamm-team#3808 fix 360-minute timeouts for `pybamm-requires` compilation

* pybamm-team#3808 ensure `pip` never uses `scikits.odes` wheels

* style: pre-commit fixes

* Don't run `pybamm_install_odes` on Python 3.12 macOS M1

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kratman kratman kratman approved these changes

@martinjrobins martinjrobins Awaiting requested review from martinjrobins martinjrobins is a code owner

@Saransh-cpp Saransh-cpp Awaiting requested review from Saransh-cpp Saransh-cpp is a code owner

@arjxn-py arjxn-py Awaiting requested review from arjxn-py arjxn-py is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fortran compiler (FC variable) missing in macOS M-series runners, breaks SUNDIALS compilation
2 participants
@agriyakhetarpal @kratman